8ff7e9ab57ce6dde37562661b83005145713b723,enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java,MasterImpl,acquireExclusiveLock,#RequestContext#Locks.ResourceType#number#,358

Before Change


        try
        {
            session.client().acquireExclusive( type, resourceIds );
            return packResponse( context, new LockResult( LockStatus.OK_LOCKED ) );
        }
        catch ( DeadlockDetectedException e )
        {

After Change


    public Response<LockResult> acquireExclusiveLock( RequestContext context, Locks.ResourceType type,
                                                      long... resourceIds )
    {
        msgLog.info( "@@@ acquireExclusiveLock: IN: from: " + context.machineId() + " type: " + type + " resources: " +
                Arrays.toString( resourceIds ) );

        assertCorrectEpoch( context );
        LockSession session = resume( context );
        try
        {
            session.client().acquireExclusive( type, resourceIds );
            Response<LockResult> lockResultResponse = packResponse( context, new LockResult( LockStatus.OK_LOCKED ) );

            msgLog.info( "@@@ acquireExclusiveLock: OK: from: " + context.machineId() + " type: " + type + " " +
                    "resources: " + Arrays.toString( resourceIds ) );

            return lockResultResponse;
        }
        catch ( DeadlockDetectedException e )
        {
            Response<LockResult> lockResultResponse = packResponse( context, new LockResult( e.getMessage() ) );

            msgLog.info( "@@@ acquireExclusiveLock: NOK: from: " + context.machineId() + " type: " + type + " " +
                    "resources: " + Arrays.toString( resourceIds ) );

            return lockResultResponse;
        }
        catch ( IllegalResourceException e )
        {
            Response<LockResult> lockResultResponse = packResponse( context, new LockResult( LockStatus.NOT_LOCKED ) );

            msgLog.info( "@@@ acquireExclusiveLock: NOK: from: " + context.machineId() + " type: " + type + " " +
                    "resources: " + Arrays.toString( resourceIds ) );

            return lockResultResponse;
        }